Fixed typos & Added default values