Added more Y examples, fixed bugs