Fix for #167 when starting mission

+ various fixes