cleanups; all examples are working again