updated generation-script (bugfixes)