Initial gemification
Various fixes