Some cleanup, configuration manager and international support