Typos and improvements