Uniformity
Let Flow play in the same ball park
Further cleanup