Polishing

Fixes #39, #42, #43 and #44