Some update and correction