Changed modifier key.
Various minor changes.