Ezra fixes.
Some small bugs, and some not-so-small comments.