Supports sorting by a score now and other updates