add charset and fix year