Preparations for publishing

And final changes