Added comments and more detailed reporting