improved overall config and typos