Fixed some typos, validation tweaks.