Updated after testing

Made a lot of changes locally without version control. I have bad
discipline.
Merge branch 'master' into Develop