formatting changes; revised includes to use edge cache files