added roles + fixes