more smaller fixes, while testing and checking all examples