fix comments + aliases