improved charset declaration, add new user marker