a few admin changes from moving around code