Fix order saving now that rob fixed some other bits also some cleanup