player score added.  Maybe other stuff...
merging jons stuff into branch
fixing charge bug