fixing models to assets, now merging with new master to reduce migration problems