Improved Flow

Fixes #50,#51,#52 and most of #53