Upgraded gems

Maybe fixed some bugs?