add option to limit to roles + misc things