Update to new gem version and minor tweaks.