minor changes to models
various minor changes