comments and bug fix in size