some fixes and 2 Examples