extra parsing and prep for full parse