REV: some adjust and fix