more keywords; more fixes to s/// tr/// y///