general revision, fixed closing bug