Prep1 during run through
more run-through tweaks