fixed some more stuff and removed unused imports