gem updates and some fixes