Added some comments in random places