Bugfixing

Fixes Issue #58 #59 
and no tooltips on buffs
This is a lot of extra API calls that shouldn't be needed?