Fixes for issues #146, #151, #153

Note: DedicatedConfigDefinition.cs still has incorrect whitespace from commit 71179297f30afb607d5663c6227ff8f25466de01. 
This does not attempt to fix that issue. Because of the conflicting white-space between the dev branch and the master branch, any attempts to merge dev into master will cause an conflict. This pull request will neither fix, nor make this merge request conflict any easier to deal with.