A few corrections in the source code...