improvements / typos