More internal cleanup, added more builtins, updated readme