Inputs and rankingslists improved