added admin ver. fixed some buggies