minor fixes, cleaned things, organized imports