more v1.1 stuff, see CHANGELOG