bit more cleanup, data flows now!