Feature/data entry (+ Feature/datafix's changes)

Added support for data entry, saving (Also includes changes made in other PR)
I maintain that this is not necessary. I can't reproduce the bug.