Fixed issue #2, and some of my own bugs I just created. :/