added generator tools, fixed more hostname issues