better names; added port and path