last commit for today, see TODO-file for left-over issues