Added port number and granular access to Devices/tasks
Merged in changes from my laptop from last week, resolved conflicts (hopefully)