Cleaner fix for the ungrouped vertices block. plus a todo off the list

as well.