fix comments, tests and examples