Some finalising for v0.1