- flow control changes and fixes