Fixes, cleaning.

More cleaning.
Fixes #1, and fixes #10.