fix comments and code