fixed up rounding problem, general polish