more refactoring
move buffers to rmf3