tool fixes, code redesign, etc.
Merge branch 'master' of https://github.com/RoboRave/Extra-Diamond-Mod