fix and improve

Signed-off-by: zensh <admin@zensh.com>