Tweaked POD + misc