major improvements to main pipeline, and reorganization