fixed some grouping issues, cleaned out a bunch of old stuff