Change energy functions, other general changes