Further updates to single port programs.

Still needs work though.