Tests corrected.
New comments added.