Reopen cms and fix older bugs