small improvements ...