Updated and added some additional comments