Fixed comments and drop on map