Typos and overall improvements