fixed propagate, kinda

still fixing some bugs .. testing will follow