small bug fixed
tidy up a bit
update list check order