In preparation of 3.0.2

See ChangeLog, clean-up, commented examples in carb and buffer which
prevented compilation