content upgrades
aliases and commentary
merging and menu updates