functions\? now work (so something screwy regression now gone) so can add to keyword list and not use generic regex
refinement added but then commented out due to side effects
changes post rgchris eyeballing