Importing from other files; bug fixes