Pedro's cleanup

Fixes to pod name spaces, early vitae system, etc...