comments & minor bug fix