Fixed a bunch of annoygin bugs and tweaked some things.