Various improvements based on Charles Greer's review

This addresses #230.