Bullet: fix correct Model class, update swig, fix 1347 & 1453