More role annotations; bug fixes