several cleanups now that I figured out how to work with include documents