comments and bug fix