Minor updates to Body and Model, see #138