Include the settings and fixed a couple typos