Agreed, 2.0.0 seems to be a lot better with energy management. My only suggestion (and this was a problem in 1.9.8 and 9 as well) is that Rake isn't used on targets that don't already have it. It seems to either mangle or shred to 5cp to get Rip up before Rake will be applied.