draft version

fixes

fixes2

fixes3