fix several hard coded numbers