diff --git a/LICENSE b/LICENSE
index bdafa11..8675084 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2017 Bruce Hill
+Copyright 2018 Bruce Hill
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/Makefile b/Makefile
index c08b495..9059d08 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,11 @@
 
 # ========= User-controlled variables ========
 LUA= lua
-LUA_BIN= /usr/local/bin/$(LUA)
+LUA_BIN= $(shell which $(LUA))
 
 PREFIX=/usr/local
-BIN_DIR= $(PREFIX)/bin
-NOMSU_DIR= $(PREFIX)/lib/nomsu
+NOMSU_BIN_DIR= $(PREFIX)/bin
+NOMSU_LIB_DIR= $(PREFIX)/lib/nomsu
 
 # ========= You shouldn't need to mess with any of these variables below ================
 
@@ -21,7 +21,7 @@ LIB_NOM_FILES= $(wildcard lib/*.nom)
 LIB_LUA_FILES= $(patsubst %.nom,%.lua,$(LIB_NOM_FILES))
 PEG_FILE= nomsu.peg
 
-NOMSU_HEADER=\#!$(LUA_BIN)\npackage.path = [[$(realpath $(NOMSU_DIR))/?.lua;]]..package.path\npackage.nomsupath = [[$(realpath $(NOMSU_DIR))]]
+NOMSU_HEADER=\#!$(LUA_BIN)\npackage.path = [[$(realpath $(NOMSU_LIB_DIR))/?.lua;]]..package.path\npackage.nomsupath = [[$(realpath $(NOMSU_LIB_DIR))]]
 
 all: build optimize
 
@@ -51,15 +51,15 @@ optimize: build $(CORE_LUA_FILES) $(LIB_LUA_FILES)
 
 .PHONY: clean
 clean:
-	rm -rf nomsu core/*.lua lib/*.lua $(BIN_DIR)/nomsu $(NOMSU_DIR)
+	rm -rf nomsu core/*.lua lib/*.lua $(NOMSU_BIN_DIR)/nomsu $(NOMSU_LIB_DIR)
 
 .PHONY: install
 install: all
-	mkdir -p $(BIN_DIR) && cp nomsu $(BIN_DIR)
-	mkdir -p $(NOMSU_DIR) && cp -r $(LUA_FILES) $(PEG_FILE) core lib $(NOMSU_DIR)
+	mkdir -p $(NOMSU_BIN_DIR) && cp nomsu $(NOMSU_BIN_DIR)
+	mkdir -p $(NOMSU_LIB_DIR) && cp -r $(LUA_FILES) $(PEG_FILE) core lib $(NOMSU_LIB_DIR)
 
 .PHONY: uninstall
 uninstall: all
-	rm -rf $(NOMSU_DIR) $(BIN_DIR)/nomsu
+	rm -rf $(NOMSU_LIB_DIR) $(NOMSU_BIN_DIR)/nomsu
 
 # eof
diff --git a/README.md b/README.md
index 57c26bd..a100c1e 100644
--- a/README.md
+++ b/README.md
@@ -10,23 +10,36 @@ Nomsu's only dependencies are [Lua 5.2 or later](https://www.lua.org/) (tested w
 
 ## Usage
 
-* To get a nomsu [REPL](https://en.wikipedia.org/wiki/Read-eval-print_loop), simply run `lua nomsu.lua`.
-* To run a .nom file with nomsu code, run `lua nomsu.lua your_file.nom`.
+* To get a Nomsu [REPL](https://en.wikipedia.org/wiki/Read-eval-print_loop), simply run `lua nomsu.lua` (or `luajit nomsu.lua`).
+* To run a .nom file with Nomsu code, run `lua nomsu.lua your_file.nom`.
 * (Advanced/optional) To precompile a .nom file into lua, run `lua nomsu.lua -c <input_file>` to precompile your file into lua (by default, saved in the same location, but with a `.lua` extension instead of `.nom`). If you run the compiler with the "-O" (for Optimized) flag, the compiler will run the precompiled lua files directly, instead of parsing and compiling the .nom files before running them. This is not necessary, but it can speed things up if you precompile a bunch of code that involves macros or compile-time activity.
 * More usage options are avilable via `lua nomsu.lua --help`.
 
-## Layout
+## Compiling/installing
 
-* `nomsu.moon`/`nomsu.lua` - **The nomsu compiler**. The compiler is written in [Moonscript](http://moonscript.org/), but a lua version of the file is provided in this repository for convenience.
-* `nomsu_tree.moon`/`nomsu_tree.lua` - Datastructures used for Nomsu ASTs.
-* `code_obj.moon`/`code_obj.lua` - Datastructures used for incrementally building generated code, while preserving code origins.
+If you enjoy Nomsu so much that you'd like to tinker with it or have it in your system path, there is an included Makefile. This is entirely optional, but you can run `make` to compile any modified .moon or .nom files into .lua files and produce an executable file called `nomsu` that can be run directly. `make test` will run the suite of tests. `make install` will install the compiler on your system. By default, the `nomsu` executable will be put in `/usr/local/bin` and all the necessary support files will be put into `/usr/local/share/nomsu/*`, but you can change the location with `make PREFIX=/your/path/here install` (or `NOMSU_BIN_DIR` and `NOMSU_LIB_DIR` to specify them separately). The default build options use the system default `lua`, but this can be changed via `make LUA=luajit` or `make LUA_BIN=/path/to/lua`. To uninstall, simply `make uninstall` with the same flags you used to install.
+
+## File Layout
+
+All `.moon` files have been precompiled into corresponding `.lua` files, so you don't need to have [Moonscript](http://moonscript.org/) installed to run the Nomsu compiler.
+
+* `nomsu.moon` - The Nomsu command line runner. This handles launching the compiler and running the REPL.
+* `nomsu.peg` - The [Parsing Expression Grammar](https://en.wikipedia.org/wiki/Parsing_expression_grammar) used to define Nomsu's syntax. The format of this file is a slightly modified version of the format accepted by LPEG's `re` module.
+* `nomsu_compiler.moon` - **The actual Nomsu compiler**. This file can be imported and used without going through the regular command line interface (e.g. for applications that want to embed the compiler).
+* `parser.moon` - The Nomsu parser. This file can also be imported and used directly for applications that only need to *parse* Nomsu, not compile it.
+* `nomsu_tree.moon` - Datastructures used for Nomsu ASTs.
+* `code_obj.moon` - Datastructures used for incrementally building generated code, while preserving code origins.
+* `error_handling.moon` - The logic for producing good error messages within Lua that reference the Nomsu source code that led to them.
 * `utils.lua` - A set of utility actions used by nomsu.moon.
+* `uuid.lua` - A simple Universally Unique Identifier implementation (RFC 4122) used internally to give each object a randomized unique ID.
 * `consolecolors.lua` - Lua module that defines ANSI color codes for colored console output (used internally in nomsu.moon).
-* `examples/how_do_i.nom` - A simple walkthrough of some of the features of nomsu, written in nomsu. **This is a good place to start.**
+* `examples/how_do_i.nom` - A simple walkthrough of some of the features of Nomsu, written in Nomsu code. **This is a good place to start.**
 * `core/*.nom` - Core language definitions of stuff like control flow, operators, and metaprogramming, broken down into different files.
 * `lib/*.nom` - Optional language libraries for stuff you might want, like interfacing with the OS, or doing Object Oriented Programming.
 * `tests/*.nom` - A somewhat exhaustive set of minimalist tests for almost every language feature defined in `core/*.nom` and `lib/*.nom`
-* `compile_lib.sh` - script to precompile `core/*.nom` and `lib/*.nom` so they can be loaded faster. This is optional.
+* `Makefile` - Rules for building/installing the compiler.
+* `LICENSE` - The software license (MIT).
+* `README.md` - This file.
 
 ## Extra
 
diff --git a/compile_lib.sh b/compile_lib.sh
deleted file mode 100755
index 463bb20..0000000
--- a/compile_lib.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# This file is a script that converts the .nom files in lib/ into slightly more optimized
-# precompiled versions that are only lua> ".." and =lua ".." bits which are faster to load.
-set -e
-moonc *.moon
-rm -f core/*.lua lib/*.lua
-luajit ./nomsu.lua -c core lib
-echo "done."