multiple fixes and improvements; see CHANGELOG.md