Resolves Data Engine bugs
Fixing bugs

Bugs in iteration 4 code