Final walk through of the code, fix pod, move the private testsuite around some more...
fix manifest