new map labels, fix date stuff