Cleanup.
Recategorized Buffer.
Merge branch 'master' into 48hrTrial