Bug fixes

Fixed things in model that I’d forgotten