Many small edits including primary-port=3301