minor bugfixes; new, simplier examples