minor visual cleanups
add remedial NET parsing