Updates/fixes from testing with more mission scripts.