dhcp - fixes and improvements