Minor changes, fixed typos