lots of small improvements...