Continuation of bug fixing: code to care for the data.
Continuation of bug fixing: removed tempoarary fixing code.