Fix some things up
I think *I think* it's done now. YAY!