fixes; builtins still need to be handled better