tweaks
ack forgot to import $CFG