formatting and adding the tweaks from last friday