Tuned charges and cleaned up html
Merge branch 'gh-pages'