Cleaned up Instance.ungroup() and other misc changes