Maybe fix location sort and other things