reviewed presentations, added examples and course programme
fixed conflicts