Polished up everything a bit, ironed out a few bugs, made some new bugs.