various fixes - see CHANGELOG