Intro changes and fixes