Gem updates & some fixes v1...