tweaked admin stuff