Develop

Changed to develop branch as requested.
Squashed any fixes to faults introduced by other commits into the offending commits.
 Reworded the commit messages to better describe the changes introduced by the commit.