Added new example.

Plus minor fixes.