Group Observers together, tidy a few strays