Lots of little gameplay fixes