Small fix and more commenting