Working imports, more bug fixes
Bug fixes