Some fixes

Fixed renaming and removing of items