adding a model and a few tweaks