Fix typos & small bugs. Readability improvements