Add meta charset, other minor cleanup