More bug fixed and comments