tf.p/q now saving the sig (for verific.), minor refactor/fixes