Added ZeroG Flight and other minor changes/fixes