updated Handy URI Templates dep
Changed port number selection
Additional changes