all done fixes