fixed data flow problem, still need to fix a few things, but itll be fine