better handling for bad range values
clean up data model acceleration
more acceleration cleanup