lots of fixes for users, cms and common