[improvement] many small improvements