Fix bug typo and add a few more potential charge measures.