Fixed some aithmetic stuff