fixed theta/p mixup
argh-vark