fix comments and defaults