general small improvements