Removed stupid tabular junk
Fixed hostname checking