I like what you've committed to github. Back on target for 2 minute blocks and 4 block retargets. That with the 4 block lookback for retargeting should help with getting difficulty stuck.