Content and Fixes

Some updates and stuff.  Part of the M/M request and the last of this chunk of Artemis.  Also some small odds and ends.