Adding comment and fix minor bug.