Fixed the old Aether issues and worked on importing data