lots of fixing for host management