pulling in difficulty nuke and KGW changes from my fork