Bug fix and add comments