Added a spot sort override and general improvements