+4 docs, -4 @todo's