fix model, error handling stable
add remove fucntion
update