fix dates and watermarks