fix comments + doc