added things
removed xadmin