Model updates, bug fixes