updated docblocks and fixed some imports again