Minor tunnings
Updated gems