cofiguration changes and fixed bugs