typos & improvements