Add comments and fixups #3389