Changing path and adding port comments
More work making things sensible