Several minor changes and improvements (discussed with Norman).