some fixes and more examples