First beginnings of admin control
merge fix and more