added names/hostname, and fixed errors