More update and fix