Fixed a few issues discovered when performing testing.
Merge branch 'master' of https://github.com/tjm1138/Ludus