Added math helper and tracking some more stuff