Fixed more bugs (P.S. This is a bad commit message, since it so undetail...

...ed, but we are noobs so oh well.)

Apparently github splits commit messages.