Polish solution and fix a few typos