Finished removing hard coded port number 1234. More fixes to come.