Edited a bit
Fixed role stuff