Further updates to crew selection in combat; should work now!