Remove cider
Various fixes
Some upgrades