Did quite a few of the TODOs scattered about, and started to work on
updating some of the mod support.
Resolve Merge Conflict
Merge remote-tracking branch 'origin/1.7-update' into 1.7-update