Updated couple hosts and fixed couple bugs in code