Fixed some more bugs. I know it's unhelpful. Post another round of testing.