Updated and cleaned gems