some adjust & fix bug