Final touches for PIPY