FJ - Cleanup,and Created local P() buffers for some funcitons
Merge branch 'Dev' into AltTuneMethod