Host refactor

hm, seems to have been only one URL wrong