Added a few minor things, and fixed what should be the last of the bugs.