Fixes, buffs, tests.