Lots of mods for the classification code; some initial work on scripted p/r