Better handling of difficulty
Balance changes for upgrades
Merge branch 'refs/remotes/origin/master'