Bug fixes, new example