cleaned up main, etc.  and started to work on the builtins