another small improvements