Update gems
Tweaks and cleanup.