Massive updates. But cleaned up port naming.