some fixups
Forgot to change var name in tools/decorator.py
Updating the config to represent ident matching.