Expanded examples plus small bug fix