backwards compatibility fixes for comparison experiments, modified some parts to now invoke lines unless needed
merge