small pod changes + a little reformatting to be ready for Message merge