Added builtin_cmd corrections and modified eval function.