Fixed flight check, minor tweaks