Mars game staging

Merging in fixes.