random fixes that came out during testing