Update input data and small fixes