Primer fixes, local performance and validation testing