Some comments and bug fix