Minor improvements and some tricky semantics around delayed evaluation. Figuring out how to finish the bootstrapping process.