item remove, improved edit,  minor stuff