minor changes to imports and fixing