Fixed Range Finders

It was one of the last relics of original code. About to open an object
oriented branch…