added the latest changes to the draft
some merge fuckups