a bunch of small improvements