Fixed a couple of bugs that went out with the last post
Missed a few files, oops
Merge branch 'hotfix/bugs'