Some adjustments

Added lots but took most of it back out. Couldn't get this to work well
with custom roles.