New roles applied and some bugs fixed