Add more hosts, fix some parser issues