Further tweaking of role detection, looks very promising.