Fixed builtins and added a basic caller
Cut a few lines to improve readability