some minor cleanup, need to learn why orders sometime fail