buffer improvements and first steps with border
Merge branch 'origin/master'