add more improvements and fixes.

Signed-off-by: Ricardo1008 <tsao.ricardo@iac.com.tw>