bugfixes and added EditOrder