(try to) Include hostname in model; fix various bugs