Minor typos fixed and some other non-functional things