update gems and add some fixes