Updated examples and general clean up.