New experiments; model fixes (shotgun commit)