Small changes and bugfixes.
Small interface changes (overview)