Building on the work from yesterday: pass through the ssh port and some fixes