Make subnet address configurable, and other tweaks.