tagged (but didn't fix) more magic numbers for #37