Cleanups, added role section