space jail fixed, game sped up
fix merge conflicts