more small improvements