Fix for adding null factor, change factor prints, added setup for q2b
part 1