Merge pull request #333 from a4894z/main

rPIE tweaks, comment out rPIE scan position correction as it's not doing things correctly (I'll fix later).

Author: a4894z