hm cleanup and making charts to work

hm cleanup and making charts to work