fixed rounding and added wind