some comments and fix