More revisions

Taking a break to see if I can quickly implement issue #34.