model edit and add bugfix