Bug fix on the recent performance boost and better comments.