more energy and misc fixes