Final version of deliverable (minor fixes).