bug fixes and more examples