Fixed some problems that were on the master branch. I think they were du...

...e to some weird merge issues. Not trying to step on any toes!