temporary commit: buffer list tweaks