more minor changes to models