Loads of polishing

Fixes #8