small design and flow.js changes