bug fixes and minor changes, see changelog