according to 1st round testing, fix part of reported bugs