Fixed order editing and a few other details.