Sorry for this non descriptive commit message. But I failed to do individual commits for about a year. Now this is kind of a cleanup thing adding all changes that have been collected since then.
