Typos and general better configuration