upgrade gems, fix collateral damage