Some minor bug fixes and some more examples