COmmitting updated flow and better server and client handling