major PP fixes, also fixing issue #186