missing import
fix plotting's use of legends
revert category cuts to CONF cuts
make nOS default fakes model like CONF
update Makefile
update norms