- Updated comments
 - Some minor fixes