fixed units: energy loss now in Joule
small style things