fix and make explicit switch port numbering