Bug fixes, Part One!

Part One of, like, a BUNCH of stuff!