modified comments for format + uncommented server specific lines