Update print-outs, add more variables for factorized model