fix comments
add support for custom ports