More doc updates
Comment cleanup
More comments