Updated Prime with more bug fixes.

Some bugs definitely fell out of the Prime extraction and restructuring, but I think this release contains all the fixes.