TODO update
Cleaning up a little bit + adjusting the zoom of the clusterer