Client now runs on server + other small changes.