small improvements: