Add small examples, improve code, rename methods