small improvements to the interfaces