Final comments and small changes