date and some mini corrections
merge