dial back the eps change insanity
Potential builder now N independent
Removed superfluous virtual variables, swapped chi to correct values(?), comment cleanup