(hopefully) add support for some built-in functions and liner comments