Yet another small pod fix.
Mostly small changes and improvements