added admin functions
fixed merge of admin stuff