Earth moved up, some cleanup