Final version

- dedication is back
- tidying up from Mr. Lokoc's feedback