cleanup more factorization bugs, start cleaning up factorized branch count to adjust for connections between saved nodes (not yet complete)