small changes: comments, naming, more sample