Item editing impl. continued + bug fixes