--added manager role
--some bug fix