lots of small improvements
few minor improvements