fix role heirarchy and vars