minor fixes to imports and name