final touches and port swap