Various edits to explore hyperprior options.
Merged changes.