More port debug commits.
Merge pull request #61 from davemun/master

More port debug commits.