fixed some flow issues ... I hope.