numerous changes related to cleanup and indexed source processing