fixing some names and adding configurations