added additional keywords, comments, unit tests