Some bugfixes, consistency and added additional_hosts support