Fix main role.
Owner and some imrpovements.