Model for the final two PA scrapers, and fixes in 
the others.