Small fix and added comments