Multiple minor fixes, ranged++

Dedicated to my dog Max.  You were a good boy, rest in peace.