Training Stages on map. Minor bug fixes