Adds some comments and a Utils