fixing tests
fixing tests
fixing tests
simple energy and spirit counters
tinkering with graphics
removed some of the badges