Fix Cider again + small tweaks.