working on 1st draft fixes