Some more steps done towards 1.0