fixed an ASSERT failure with m_workingItem
tons of reorganization
purging CString
problems!