Comments and bug fixes.