big fixes in host-setup