reorder gem file and update a couple of them