comments and bug fixed 1.1.2