Added a pre-flight view and some puzzle tweaks