wip:minor changes to charges