Comments and some other tweaks added.