several parameter cleanups, pathchange for hieradata and fix for batman.cfg