Fix references to PP form and add different options