small 'beauty'-corrections
added energy-conservation at magnetic fields