More work on range improvements. More tests