Last gem updates and some minor tweaks