Comments added and debugging code commented