Allow coarse energy to take almost all the bits. Also, fixed a some issues with