fixed imports and dependencies