Back end correction update 1/2

A correction in some code behaviour to fix minor stuff. There will be a second update soon.