fixed some little comments, imports and other issues missed