Updating gems, fixing more features