Move buf samples into flatiron
Some little tweaks, cannot resist