Refactor intro a bit (and a few other minor changes)