a bunch more roles
tweaks