Fixes and a new example