Added Admin tools and fixed up bugs