NWAF Optimized

Optimized NWAF.  buildings are no longer treated as vehicles.