Polish Universal Port

Miscellaneous requested changes to Universal Port