shortlist and fixes