Align .cider and some other minor changes