buffering...

fixing some bits and bobs.

01-01-2018