Started argument passing and fixed some typos