tweaks, fixes and buffs