More interface improvements as well as actual work.