Allow aliases for bundled commands

plus some misc commits from various branches