Minor changes.
Exists bug with switching gems without matching.