correct some typos and add default values