Pa me fix mission plan

@edwardhunter please review/merge
@bobfrat please review, it basically has a fix for mission plan (mentioned earlier today).