Re-tab ipv4 file
Assorted rebuilds
Fix more indents