Mostly performance fix. Development outputs.