Comments + minor bug fix