Bugfixes. Interface improvments.