add and fix comments and help messages