Fixing a couple of typos that occured in the transition.
Fixing overabundance of Sub commands on Tab.