ready many of the core sections for sharing
more cleanup