Add gluon content
Some charge fixes