Model amelioration

There are still some errors though