lots of small changes (see changelog)