More Work In Progress.
comment improvements