comments and fixes