ReFactored the intensity conversions a bit. This is still not the final version.