updated imports, done some cleanup