couple small improvements