Exchange flow enhancements and fixes
Generic enhancements and bug fixes