changed some constants again, and double checked formulae for different quanitites