bugfixes with data propagation, updates for deconstructor plugin