New function scanner, additional keywords and comment styles

Hi - thanks for doing this work in the first place.  if you're still interested in it, please consider this update.  Cheers.