Fixing more of Bobo's stuff. There's more to fix, but I don't know it and I'm busy