smal tweaks
merge bs
full model runs working
a few things