Added some comments and some more cr related fixes