Cleanup and more stuff for the intro