rename desugar, improve outline, update menus