added more keywords and builtins