small tweaks, working on info flow, but have not tested yet