a couple more small improvements