Clean up settings, minor typos