Remove debug, improve range info