comments working, need to fix pages