draft editing support, bugfixes