Fixed a few more problems I don't want to forget about before I begin testing.