Some corrections + basic gem structure