Fix typos and correct dhcp logic
Containers not yet working on test environment.