minor changes on models