ranger stuff, bunch of consistency renames/bugfixes