tons of small changes to address punchlist.