adds some more basic calculations
adds some more basic calculations