Updated formatting, working energy axis, etc.