Fixed some dumb stuff and added Charge
Delete Headings.xml

ye
more
Merge pull request #1 from funcdoor/fixes

Fixes