Small fixes, including new domain and sorting rotation issue