last first draft fixes