Splining implemented in model, data filtering overcounting fixed