draft, fixes