many small improvements

gg