refactoring/reorganizing buffs to prepare for making them synchronizable