Updating some models and another minor changes