some fixes and a draft