Added/Modified lots of comments