some comments and fixes