Updated a bunch of stuff. Mars, and some view things.
Merge branch 'v2' of https://github.com/ningrassia/marsproject into v2