final tweakings, draft v0.9