working map and clusters
added log out