Donezo

Last few fixes.