added messages, some change datepicker