Updated and buildable pp and pi files.