Made the calculation check case insensitive
Calculations now support decimals.