more intro and some small fix