A raft of fixes on patch-1, without the volleyball. :<

I'm sorry, Wilson...