change up hostname handling a bit