updated & cleaned gems