DHCP generator improved, Fixed small issuies