Add --port option; minor formatting improvements.