Fix more bugs in post proc, and clean it up more.