Fixed minor bugs, added unique hosts