fixed some typos and rearraged w9 features