Better intro

More fixes