Code updates (some more comments)