Update gems
Misc updates