Added clustering, smaller changes to gui