Gem update and fixed stuff that broke