little config changes
Final adjustements