big commit, model is calculating correct price targets, plethora of other changes