Minor changes, loading groups should work now.