Updated dev

done fixes