Added examples & small bug fixes