Add port and fix defaults. Fixes #1 and #2