fixed flowtext
merged master