changed calculation for fahrenheit - and changed conditional for number check