un-exposed Hosts type and fixed up CLI flags