fixed more imports and docblocks