Added more examples and removed some odd code.