fixed initialization and admin controller