added draft and some says, reworked cleaning