fixed more magic numbers