updated the order in which some things run in an effort to make less
things fail on the first run.