Putting back the accendental editing on some  Models and some quick code enhancement