Minor tweaks and change of port