several fixes in draft