commented magic numbers, increased line tolerance