interface improvements
Merge branch 'interface_improvements'