Added default port
Removed changed comment types