reverted broken host
minor bug fixes to comments parsing