BF: The order of the output needs to be like the order of the data...

Also: some more flexibility on the model API that is accepted.