Fix admin commands, add  variables