Contains features fixed while testing other branches
Merge pull request #745 from JamesGlover/miscelaneous_feature_fixes

Contains features fixed while testing other branches