Improved map refreshing
Cleaned logs