fixed issues with stateful signals not accruing state
cleaning up
cleaner every implementation