Bug fix and removing some comments.