no major changes, mostly commented lines that need cleaning up