quick bug fix and comments