Fixed a few errors and hopefully fixed a third on last commit.