A lot of changes. Fixes #16.