various changes to imports and documentation