Improved samples, fixed typos