misc small improvements