tweak

looks like i'm getting some parser failures so this needs more work;
will continue tomorrow.