PID Fixes and tweaks