Updated examples
Fixed some minor bugs