fixing all math