admin + various fixes