couple more small improvements