revert draft, bug fixes