clenaup imports, bug fixes