Fix the ability to "null" out some config options (like dhcpstart/end)
Formatting
Cleanup