small changes and fixed typos