fixed bugs and added admin