Less magic numbers in equasions, also tiny buff