some improvents to v1.20

some improvents to v1.20