Even more interface improvements.