Branch/mars improvements

Adding in #291 and #293 to staging.

@kadst43