Change feedback loop, energy to velocity conversion tweak, some cleanup