many changes including nwca parsing