some more small improvements