Adds more examples + a small bug fix