fix bugs and admin