Changes for dgamelaunch

some included from NAO patch