Aircraft movement, terrain code refactoring, general fixes