added comments, hostname, other bugfixes