Bugfixing

Fixes Issue #58 #59 
and no tooltips on buffs
Comments saying that it's a fix aren't needed. It's only contextual to this single commit, and we have that in the commit history.