Small fix and comments