Update (most) of Mars code.