adding items and cleanup