Rie's edits for swapping port assignments and minor fixes to the task…#3

riekane wants to merge 4 commits intoesutlie:masteresutlie/behavior_code:masterfrom

riekane:masterriekane/Behavior_code:masterCopy head branch name to clipboard