update gems, few bugfix