fixed untracked materials that should have been tracked. Other misc cleanups