added hostname and other tweaks