small improvements v2