Orders

- [x] Fixes #1481
- [x] Fixes #1466
- [x] Fixes #1508