Small fixes and buff icons

Small update with various fixes and small additions. Most notably is the framework for buff icons, which will be more useful later on. 

Cleaning up this first version a little, because next up is upgrading software! It should lead to improvements all around, but it also requires redoing a few things. Hopefully it will go smoothly.