make lots of updates and adjustments, no major changes