Polish

Fixes #27, Fixes #22