Typo/syntax bugfix - corrects Pickling errors.
Fixed couple of logic errors - UI components were being referenced by previous deleted objects
Couple of small changes, nothing serious.