Some fixes on things that weren't working (primarily bugs with the 2 ships)