Minor edits, cleaned up collection / itemview delete logic