Adding some comments and reverting commented out code