Completed ticket 57. Also cleaned up MCR's port number fix.