minor interface improvements
minor interface improvements