Some fixes re: logic, typos.