small improvements...