packrat stuff
Re-build, and some minor adjustments