Quick tweaks on the mathmetics