Adding an example; some bug fixes; more addresses