update gems and some fix