Much more complete list of gems
Small fix to avoid gem conflict
Small tweaks to get the gems to build