Improvements to intro. Still WIP