Add hostname support; clean up messages