- Add Port support
- Some unit testing and formatting improvements