Comments and a fiew bug fixes.