Group switching and bug fixes.