add small improvements